Add a hook to support CPU migration for VMX domains

Signed-off-by: Yunhong Jiang <yunhong.jiang@intel.com>
Signed-off-by: Arun Sharma <arun.sharma@intel.com>

diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c
index dedebbbd6c9b54937f1c1e70f2d1ece769861c1c..12a0c0cb7383a6f2647ed5f1731ca3360a066c42 100644 (file)
--- a/xen/arch/x86/domain.c
+++ b/xen/arch/x86/domain.c
@@ -297,6 +297,15 @@ void arch_do_boot_vcpu(struct vcpu *v)
         l1e_from_page(virt_to_page(gdt_table), PAGE_HYPERVISOR);
 }
 
+void
+arch_migrate_cpu(struct vcpu *v, int newcpu)
+{
+    if ( VMX_DOMAIN(v) && (v->processor != newcpu) ){
+        u64 vmcs_phys_ptr = (u64) virt_to_phys(v->arch.arch_vmx.vmcs);
+        __vmpclear(vmcs_phys_ptr);
+    }
+}
+
 #ifdef CONFIG_VMX
 static int vmx_switch_on;
 

diff --git a/xen/common/dom0_ops.c b/xen/common/dom0_ops.c
index d189528df2a71804ab33c630e77f507c9edb045f..7459676290a1cd1037adc3be9e8d55afbc1f6b34 100644 (file)
--- a/xen/common/dom0_ops.c
+++ b/xen/common/dom0_ops.c
@@ -300,8 +300,10 @@ long do_dom0_op(dom0_op_t *u_dom0_op)
             int new_cpu = (int)find_first_set_bit(cpumap) % num_online_cpus();
 
             vcpu_pause(v);
-            if ( v->processor != new_cpu )
+            if ( v->processor != new_cpu ){
                 set_bit(_VCPUF_cpu_migrated, &v->vcpu_flags);
+                arch_migrate_cpu(v, new_cpu);
+            }
             set_bit(_VCPUF_cpu_pinned, &v->vcpu_flags);
             v->processor = new_cpu;
             vcpu_unpause(v);

diff --git a/xen/include/xen/domain.h b/xen/include/xen/domain.h
index 46c2e4bb5d7a898561cd8074d895f0eb9d33a2b0..be7f2bbfbad23a5a3491f67841f418b8baa3d3f5 100644 (file)
--- a/xen/include/xen/domain.h
+++ b/xen/include/xen/domain.h
@@ -14,6 +14,8 @@ extern void arch_do_createdomain(struct vcpu *v);
 
 extern void arch_do_boot_vcpu(struct vcpu *v);
 
+void arch_migrate_cpu(struct vcpu *v, int newcpu);
+
 extern int  arch_set_info_guest(
     struct vcpu *d, struct vcpu_guest_context *c);